Skip to content

deps: group lockstep dependency families in dependabot - #2583

Merged
Quang Nguyen (nddq) merged 1 commit into
mainfrom
deps/dependabot-group-lockstep-families
Jul 27, 2026
Merged

deps: group lockstep dependency families in dependabot#2583
Quang Nguyen (nddq) merged 1 commit into
mainfrom
deps/dependabot-group-lockstep-families

Conversation

@nddq

Copy link
Copy Markdown
Member

Description

Dependabot splits three dependency families that must move together, so each PR is unmergeable on its own.

codeql-actioncodeql.yaml pins init, autobuild and analyze to one SHA, and CodeQL rejects mixed versions. actions-patch covers patch only, so minor bumps get one PR per sub-action and every Analyze job fails:

##[error]Loaded a configuration file for version '4.36.3', but running version '4.37.2'

That is #2573, #2574 and #2575.

k8shelm.sh/helm/v3 is in no group but pins k8s.io/client-go transitively (v3.21.3 needs v0.36.2, controller-runtime v0.23.3 needs v0.35.0). Bumping helm alone fails on handlerRegistration does not implement cache.ResourceEventHandlerRegistration (missing method HasSyncedChecker), so #2544 and #2324 are two halves of one change.

ciliumcilium/cilium v1.19.3 pins hive, statedb and stream to exactly retina's versions; moving them alone breaks cilium's own source (#2543, #2520).

Changes

Related Issue

N/A.

Checklist

  • I have read the contributing documentation.
  • I signed and signed-off the commits (git commit -S -s ...). See this documentation on signing commits.
  • I have correctly attributed the author(s) of the code.
  • I have tested the changes locally.
  • I have followed the project's style guidelines.
  • I have updated the documentation, if necessary.
  • I have added tests, if applicable.

Screenshots (if applicable) or Testing Completed

Local run against the real updater image: main produces three ungrouped codeql PRs, this config produces one holding all four. Dropping exclude-patterns reproduces main exactly.

Hosted Dependabot on a fork:

PR Contents
codeql-action, 4 updates all four sub-actions on one SHA, v4.37.3
k8s, 7 updates helm 3.21.13.21.3, controller-runtime 0.23.30.24.1, k8s.io/*0.36.2
cilium, 4 updates cilium/cilium v1.19.3v1.19.6 with ebpf v0.22.0 and statedb v0.5.9, as v1.19.6 requires

Schema-validates against dependabot-2.0.json with no new errors versus main.

Additional Notes

configloader stays put until the k8s group lands: its bump raises k8s.io/api to 0.36.x while kubectl stays at 0.35.3, whose pkg/scheme imports k8s.io/api/scheduling/v1alpha1, removed in 0.36. go mod tidy fails with it alone and passes with the full set, so no extra config is needed.

Once this lands, #2573, #2574, #2575, #2544, #2324, #2543 and #2520 can be closed.

Dependabot splits families that must move together into separate PRs,
each of which is unmergeable on its own.

github/codeql-action/{init,autobuild,analyze} are pinned to one SHA;
bumping one leaves the workflow on mixed versions, which CodeQL rejects.
Group them. actions-patch declares no patterns, so it scores
NO_PATTERNS_SCORE (500) in Dependabot's pattern-specificity calculator
and out-ranks the codeql-action group (106) regardless of ordering;
excluding codeql-action from actions-patch removes it from that contest.

helm.sh/helm/v3 and cloud-provider-azure's configloader transitively pin
k8s.io/client-go, so they must move with the k8s group. cilium
hive/statedb/stream are pinned by cilium/cilium's own go.mod and cannot
move independently; ignore them so they follow cilium/cilium via MVS.

Signed-off-by: Quang Nguyen <nguyenquang@microsoft.com>
@github-actions

Copy link
Copy Markdown

Retina Code Coverage Report

Total coverage no change

Decreased diff

Impacted Files Coverage
pkg/controllers/daemon/namespace/namespace_controller.go 78.46% ... 76.24% (-2.22%) ⬇️

@nddq
Quang Nguyen (nddq) added this pull request to the merge queue Jul 27, 2026
Merged via the queue into main with commit 77c8b74 Jul 27, 2026
40 of 42 checks passed
@nddq
Quang Nguyen (nddq) deleted the deps/dependabot-group-lockstep-families branch July 27, 2026 16:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants